Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Tamron SP 15-30mm F/2.8 Di VC USD G2 (backport #3063) #3091

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Add Tamron SP 15-30mm F/2.8 Di VC USD G2 (backport #3063) #3091

merged 2 commits into from
Dec 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2024

Resolves #3062 @boardhead

This is an automatic backport of pull request #3063 done by Mergify.

@mergify mergify bot added the conflicts label Dec 13, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Dec 13, 2024

Cherry-pick of 912e23f has failed:

On branch mergify/bp/0.28.x/pr-3063
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit 912e23f1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/canonmn_int.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Dec 13, 2024
Merged
@kmilos
Add Tamron SP 15-30mm f/2.8 Di VC USD G2 for Canon
b48b937 
(cherry picked from commit 912e23f)

# Conflicts:
#	src/canonmn_int.cpp
@kmilos
Add Tamron SP 15-30mm f/2.8 Di VC USD G2 for Nikon
917a1bd 
(cherry picked from commit 21cdd41)
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-3063 branch from 6446044 to 917a1bd Compare December 13, 2024 22:59
@kmilos kmilos removed the conflicts label Dec 13, 2024
@kmilos kmilos merged commit d419993 into 0.28.x Dec 13, 2024
62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3063 branch December 13, 2024 23:07
@kmilos kmilos added this to the v0.28.4 milestone Dec 14, 2024
@kmilos kmilos added the lens Issue related to lens detection label Dec 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kmilos kmilos kmilos approved these changes

Assignees
No one assigned
Labels
lens Issue related to lens detection
Projects
None yet
Milestone
v0.28.4
Development

Successfully merging this pull request may close these issues.
1 participant
@kmilos